From: Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
Date: Tue, 1 Feb 1994 17:33:14 +0000 (+0000)
Subject: (x_set_menu_bar_lines): Test also menubar_widget before calling
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~93339
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e021605ff3f7e83cef81d7e7e66a41f6f7732fc4;p=emacs.git

(x_set_menu_bar_lines): Test also menubar_widget before calling
XtDestroyWidget.
---

diff --git a/src/xfns.c b/src/xfns.c
index 4b5de9329c9..4ffd39f7df4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1076,7 +1076,8 @@ x_set_menu_bar_lines (f, value, oldval)
     FRAME_EXTERNAL_MENU_BAR (f) = 1;
   else
     {
-      if (FRAME_EXTERNAL_MENU_BAR (f) == 1)
+      if (FRAME_EXTERNAL_MENU_BAR (f) == 1 
+	  && f->display.x->menubar_widget)
 	XtDestroyWidget (f->display.x->menubar_widget);
       FRAME_EXTERNAL_MENU_BAR (f) = 0;
       f->display.x->menubar_widget = 0;